From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 19 Jan 2011 23:58:00 +0000 (-0800)
Subject: Merge from mainline.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~5134^2~1
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=e7fb066b4d6855c18940a99f2fa8a8ea49ec7f59;p=emacs.git

Merge from mainline.
---

e7fb066b4d6855c18940a99f2fa8a8ea49ec7f59